Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)
commitf808125f3c31b70e7ce73d33847ff153de414542
treeba2e4cc15549833b7b0647e32442de714ca5443a
parent2b0871f392db04b66df07d1c2914fbdde7c678cf
parent943b2f68287a767d956670c764d9b53e89460e7d
Merge from trunk.